Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

psp-9457 leases allow disposed properties to be added. #4532

Merged
merged 1 commit into from
Dec 17, 2024

Conversation

devinleighsmith
Copy link
Collaborator

No description provided.

@devinleighsmith devinleighsmith added the bug Something isn't working label Dec 16, 2024
@devinleighsmith devinleighsmith self-assigned this Dec 16, 2024
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

3 similar comments
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

Comment on lines 548 to 554
var isDisposedOrRetired = existingPropertyLeases.Any(p => p.Property.IsRetired.HasValue)
|| propertyWithAssociations?.PimsDispositionFileProperties?.Any(d => d.DispositionFile.DispositionFileStatusTypeCode == DispositionFileStatusTypes.COMPLETE.ToString()) == true;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: the old logic had this x.Property.IsRetired.HasValue && x.Property.IsRetired.Value to account for NULLABLE retired flag to have a value (and that the value is true).

However the new/fixed logic is only checking that "IsRetired" is not null. Shouldn't we also check that it is true as well below?
existingPropertyLeases.Any(p => p.Property.IsRetired.HasValue)

var propertyRepository = this._helper.GetService<Mock<IPropertyRepository>>();
var userRepository = this._helper.GetService<Mock<IUserRepository>>();

PimsProperty disposedProperty = new PimsProperty()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: disposedProperty -> retiredProperty

Comment on lines 687 to 691
[Fact]
public void UpdateProperties_MatchProperties_Success_NoInternalId()
{
// Arrange
var lease = EntityHelper.CreateLease(1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this test was already added in your other PR. Not sure if it would end up in a duplicate test when both PRs get merged

Copy link
Collaborator

@asanchezr asanchezr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

1 similar comment
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

@devinleighsmith devinleighsmith force-pushed the psp-9457 branch 2 times, most recently from f1ef8b4 to b1fb3a3 Compare December 17, 2024 01:06
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

3 similar comments
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

1 similar comment
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4532

@devinleighsmith devinleighsmith merged commit ab9e7dc into bcgov:dev Dec 17, 2024
10 checks passed
devinleighsmith added a commit that referenced this pull request Dec 19, 2024
* PSP-9565: Changes on automation test set to accomodate GHA (#4516)

* data changes

* Testing browsers

* changing .net 6.0 to .net 8.0

* Deleting EdgeDriver nuget package

* Changes on webdriver config

* Update integration-test.yml

* Changes on automation test set - IS94

* Changes to adapt GHA

* Changing checklist button to explicit path

* Correcting a research file element

* CI: Bump version to v5.7.0-94.21

* psp-9500 Scheduler microservice (#4483)

* split off geoserver functionality into a microservice - update docker and ci/cd to support.

* psp-9500 scheduler microservice.

* change service scope

* Readme updates.

* github action corrections.

---------

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.7.0-94.22

* Bump version to IS95 (#4518)

* CI: Bump version to v5.7.0-95.1

* PSP-9569 : H 120 document- Generated document shows full names, inste… (#4519)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.7.0-95.2

* Github action fixes (#4520)

* CI: Bump version to v5.7.0-95.3

* Lease Historical file alignment fix (#4521)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.4

* PSP-9517 Remove "cannot determine" region dropdown from User Management screen under Admin Tools (#4522)

* Remove "Cannot determine" region from user management page

* Test updates

* CI: Bump version to v5.7.0-95.5

* Adding requested tooltip on View and Update forms (#4523)

* CI: Bump version to v5.7.0-95.6

* IS-95.00 Database Schema (#4511)

* IS-95.00 Database Schema

PSP_PIMS | Development Sprint: S95.00 | Design Sprint: 94 | Date: 2024-Dec-03
- Altered tables:
  - PIMS_ACQUISITION_FILE
  - PIMS_ACQUISITION_FILE_HIST
  - PIMS_COMPENSATION_REQUISITION
  - PIMS_COMPENSATION_REQUISITION_HIST
  - PIMS_EXPROPRIATION_PAYMENT
  - PIMS_EXPROPRIATION_PAYMENT_HIST
- Added build script:
  - 007_PSP_PIMS_COMPENSATION_REQUISITION_HIST_Add.sql
- Altered build script:
  - 007_PSP_PIMS_ACQUISITION_FILE_HIST_Add.sql
- Altered test script:
  - 043_PIMS_ACQUISITION_FILE.sql
- Requires additional metadata to meet standards

* Fixed alter down

* Aligning to LATEST

---------

Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.7

* IS 95 scaffold (#4525)

* Generated scaffold

* Fixed backend compilation and removed todos.

* CI: Bump version to v5.7.0-95.8

* PSP-9283 : UI UX Clean Up - Acquisition - Stakeholders - edit button (#4524)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.7.0-95.9

* PSP-8923: UI UX Clean Up - Left Side Menu - Clicked icon stage (#4526)

* Adding new yellow tone color

* Adding highlighted color to selected path on the side Menu

* Color format change

* update snapshots

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.10

* Remove unecessary SetOriginalConcurrencyControlNumber method. (#4527)

* CI: Bump version to v5.7.0-95.11

* PSP-9279 UI UX - Acquisition - Agreements & Expropriation - UI Button update for consistency  (#4528)

* PSP-9279 UI UX cleanup - make generate buttons consistent

* Update snapshots

* Test updates

* CI: Bump version to v5.7.0-95.12

* psp-9632 limit the default bounds when resetting. (#4533)

Co-authored-by: Smith <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.13

* psp-9715 fix issues adding properties with no locations, and also override research file property updates. (#4530)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.14

* [CI] Fix build failures after ubuntu-latest upgrade to 24.04 (#4537)

* CI: Bump version to v5.7.0-95.15

* psp-9457 prevent disposed properties from being added to leases. (#4532)

* CI: Bump version to v5.7.0-95.16

* disposition override corrections - ensure save redirect functions. (#4536)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.17

* psp-9530 allow research files to add retired properties. (#4534)

* psp-9530 allow research files to add retired properties.

* fix test compilation error.

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.18

* PSP-8573 | Updated list headers (#4531)

* Updated list headers

* Added icons

* Fixed Typos

* lint fixes

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.19

* PSP-9655 : FT-REG: When creating a new file approximately after 4pm P… (#4540)

* PSP-9655 : FT-REG: When creating a new file approximately after 4pm PST timezone, PIMS timestamps the file with the next day's date

* - test updates

* - test updates

---------

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.20

---------

Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: devinleighsmith <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Eduardo <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Doug Filteau <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants